[BUG_FIX]Fix compilation bugs #8834
+213
−96
We went looking everywhere, but couldn’t find those commits.
Sometimes commits can disappear after a force-push. Head back to the latest changes here.